projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cf62a1 336d728)
upstream
authorJoakim Verona <joakim@verona.se>
Tue, 28 May 2013 21:39:22 +0000 (23:39 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 28 May 2013 21:39:22 +0000 (23:39 +0200)
1  2 
lisp/progmodes/cc-mode.el patch | diff1 | diff2 | blob | history
lisp/vc/vc-dir.el patch | diff1 | diff2 | blob | history

diff --cc lisp/progmodes/cc-mode.el
Simple merge
diff --cc lisp/vc/vc-dir.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.